Fix mismatch of enum sizes between WASM and host#4676
Merged
lum1n0us merged 1 commit intobytecodealliance:mainfrom Mar 9, 2026
Merged
Fix mismatch of enum sizes between WASM and host#4676lum1n0us merged 1 commit intobytecodealliance:mainfrom
lum1n0us merged 1 commit intobytecodealliance:mainfrom
Conversation
Contributor
|
I believe we should synchronize this modification with core/iwasm/libraries/lib-socket/inc/wasi_socket_ext.h. |
yamt
reviewed
Nov 6, 2025
Contributor
|
I have replaced enums to defines. Please let me know if you'd like to change some naming or anything else additionally in this PR. |
- refactor(wasi_types): deprecate enums in platform_wasi_types.h. - Use macros instead. Signed-off-by: Krisztian Szilvasi <34309983+kr-t@users.noreply.github.com> Signed-off-by: Dan Kouba <dan@atym.io>
3c567b8 to
ffd4183
Compare
Contributor
|
Squashed and rebased to latest main. |
lum1n0us
approved these changes
Mar 9, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
While working with WAMR on Zephyr, I discovered that the sizes of a couple socket enums were not consistent between the host and inside of WASM. This resulted in an inability to create a UDP socket, as the layout of the enum was compressed (enums became 1 byte instead of 4) and the offset of
hints_enabledwas incorrect, and therefore all sockets created were TCP.In WASM:
sizes: enum=4, hints_t=12, off(type)=0 off(family)=4 off(en)=8In Zephyr host:
sizes: enum=1, hints_t=3, off(type)=0 off(family)=1 off(en)=2As a result I've enforced the struct sizes using the same method it was done for a different enum and added the appropriate assertions to validate.